diff --git a/sqlitebrowser/sqlitebrowser/addfieldform.h b/sqlitebrowser/sqlitebrowser/addfieldform.h
index c2ce8306..a4803a0f 100644
--- a/sqlitebrowser/sqlitebrowser/addfieldform.h
+++ b/sqlitebrowser/sqlitebrowser/addfieldform.h
@@ -12,8 +12,12 @@
 #define QT_END_NAMESPACE
 #endif
 
-#include <Qt3Support/Q3MimeSourceFactory>
 #include <QtCore/QVariant>
+#include <QtCore/QStringList>
+
+
+#include <Qt3Support/Q3MimeSourceFactory>
+
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
@@ -71,15 +75,17 @@ public:
 
         hboxLayout->addItem(spacer15);
 
+        //** Cancel Button
         cancelButton = new QPushButton(addFieldForm);
+        cancelButton->setIcon(QIcon(":/icons/cancel"));
         cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
-
         hboxLayout->addWidget(cancelButton);
 
+        //** Create Button
         createButton = new QPushButton(addFieldForm);
         createButton->setObjectName(QString::fromUtf8("createButton"));
         createButton->setDefault(true);
-
+        createButton->setIcon(QIcon(":/icons/save"));
         hboxLayout->addWidget(createButton);
 
 
@@ -119,6 +125,38 @@ public:
 
         hboxLayout1->addWidget(typeBox);
 
+        //**** Field Types Radios
+        QVBoxLayout *radioLayout = new QVBoxLayout();
+        vboxLayout1->addLayout(radioLayout);
+        QStringList radioItemLabels;
+        radioItemLabels.append(QApplication::translate("addFieldForm", "TEXT", 0, QApplication::UnicodeUTF8));
+//        << QApplication::translate("addFieldForm", "TEXT", 0, QApplication::UnicodeUTF8)
+//        << QApplication::translate("addFieldForm", "NUMERIC", 0, QApplication::UnicodeUTF8)
+//        << QApplication::translate("addFieldForm", "BLOB", 0, QApplication::UnicodeUTF8)
+//        << QApplication::translate("addFieldForm", "INTEGER PRIMARY KEY", 0, QApplication::UnicodeUTF8)
+//        ;
+        QRadioButton *radioTEXT = new QRadioButton();
+        radioTEXT->setText(QApplication::translate("addFieldForm", "TEXT", 0, QApplication::UnicodeUTF8));
+        radioLayout->addWidget(radioTEXT);
+
+        QRadioButton *radioNUMERIC = new QRadioButton();
+        radioNUMERIC->setText(QApplication::translate("addFieldForm", "NUMERIC", 0, QApplication::UnicodeUTF8));
+        radioLayout->addWidget(radioNUMERIC);
+
+        QRadioButton *radioBLOB = new QRadioButton();
+        radioBLOB->setText(QApplication::translate("addFieldForm", "BLOB", 0, QApplication::UnicodeUTF8));
+        radioLayout->addWidget(radioBLOB);
+
+
+        QRadioButton *radioINTPRIMARY = new QRadioButton();
+        radioINTPRIMARY->setText(QApplication::translate("addFieldForm", "INTEGER PRIMARY KEY", 0, QApplication::UnicodeUTF8));
+        radioLayout->addWidget(radioINTPRIMARY);
+
+
+        QRadioButton *radioCustom = new QRadioButton();
+        radioCustom->setText(QApplication::translate("addFieldForm", "Custom", 0, QApplication::UnicodeUTF8));
+        radioLayout->addWidget(radioCustom);
+
         typeButton = new QToolButton(addFieldForm);
         typeButton->setObjectName(QString::fromUtf8("typeButton"));
         QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
@@ -136,6 +174,7 @@ public:
         gridLayout->addLayout(vboxLayout1, 0, 1, 1, 1);
 
 
+
         retranslateUi(addFieldForm);
         QObject::connect(cancelButton, SIGNAL(clicked()), addFieldForm, SLOT(reject()));
         QObject::connect(createButton, SIGNAL(clicked()), addFieldForm, SLOT(confirmAddField()));
diff --git a/sqlitebrowser/sqlitebrowser/form1.cpp b/sqlitebrowser/sqlitebrowser/form1.cpp
index b35620d8..6b0a8398 100644
--- a/sqlitebrowser/sqlitebrowser/form1.cpp
+++ b/sqlitebrowser/sqlitebrowser/form1.cpp
@@ -1210,7 +1210,27 @@ void mainForm::on_tree_context_menu(const QPoint &qPoint){
     if(cItem->text(1) == "table"){
         editDeleteTableActionPopup->setDisabled(false);
         editModifyTableActionPopup->setDisabled(false);
-        popupDbMenu->exec( dbTreeWidget->mapToGlobal(qPoint) );
+        popupTableMenu->exec( dbTreeWidget->mapToGlobal(qPoint) );
+
+    }else if(cItem->text(1) == "field"){
+         popupFieldMenu->exec( dbTreeWidget->mapToGlobal(qPoint) );
     }
 }
 
+
+//void mainForm::on_edit_field(){
+    //if( !dbTreeWidget->currentItem() ){
+    //    return;
+    //}
+//    QTreeWidgetItem *item = dbTreeWidget->currentItem();
+//    editFieldForm *fieldForm = new editFieldForm( this, "editfield", true );
+//    fieldForm->setInitialValues(item->text(0), item->text(1));
+//    if (fieldForm->exec())
+//    {
+//        //modified = true;
+//        //do the sql rename here
+//        //qDebug(fieldForm->name + fieldForm->type);
+//        item->setText(0,fieldForm->name);
+//        item->setText(1,fieldForm->type);
+//    }
+//}
diff --git a/sqlitebrowser/sqlitebrowser/form1.h b/sqlitebrowser/sqlitebrowser/form1.h
index 784cb1de..237625c3 100644
--- a/sqlitebrowser/sqlitebrowser/form1.h
+++ b/sqlitebrowser/sqlitebrowser/form1.h
@@ -90,9 +90,12 @@ public:
     QVBoxLayout *vboxLayout1;
 
     QTreeWidget *dbTreeWidget;
-    QMenu *popupDbMenu;
+    QMenu *popupTableMenu;
+    QMenu *popupFieldMenu;
+
     QAction *editModifyTableActionPopup;
     QAction *editDeleteTableActionPopup;
+    QAction *editModifyFieldActionPopup;
 
     QWidget *browser;
     QVBoxLayout *vboxLayout2;
@@ -264,6 +267,12 @@ public:
         editModifyTableActionPopup->setEnabled(false);
         editModifyTableActionPopup->setIcon(QIcon(":/icons/table_modify"));
 
+
+        //** Modufy Field
+        editModifyFieldActionPopup = new QAction(mainForm);
+        editModifyFieldActionPopup->setText("Modify Field");
+        editModifyFieldActionPopup->setIcon(QIcon(":/icons/field_edit"));
+
         //** Create Index
         editCreateIndexAction = new QAction(mainForm);
         editCreateIndexAction->setObjectName(QString::fromUtf8("editCreateIndexAction"));
@@ -561,11 +570,16 @@ public:
         PopupMenu->addAction(helpAboutAction);
 
         //***********************************************8
-        //** Db Tree Popup Menu
-        popupDbMenu = new QMenu(mainForm);
-        popupDbMenu->addAction(editModifyTableActionPopup);
-        popupDbMenu->addSeparator();
-        popupDbMenu->addAction(editDeleteTableActionPopup);
+        //** Db Tree Popup Menus
+        popupTableMenu = new QMenu(mainForm);
+        popupTableMenu->addAction(editModifyTableActionPopup);
+        popupTableMenu->addSeparator();
+        popupTableMenu->addAction(editDeleteTableActionPopup);
+
+        popupFieldMenu = new QMenu(mainForm);
+        popupFieldMenu->addAction(editModifyFieldActionPopup);
+        //spopupFieldMenu->addSeparator();
+        //popupFieldMenu->addAction(editDeleteTableActionPopup);
 
 
         retranslateUi(mainForm);