diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/highlighting/SqlSyntaxHighlighter.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/highlighting/SqlSyntaxHighlighter.kt
index ff6a02bb..b5057dc2 100644
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/highlighting/SqlSyntaxHighlighter.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/highlighting/SqlSyntaxHighlighter.kt
@@ -108,21 +108,21 @@ class SqlSyntaxHighlighter : SyntaxHighlighter {
          "RESULT", "RETURN", "RETURNED_CARDINALITY", "RETURNED_LENGTH", "RETURNED_OCTET_LENGTH", "RETURNED_SQLSTATE",
          "RETURNS", "REVOKE", "RIGHT", "RLIKE", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROUTINE_CATALOG",
          "ROUTINE_NAME", "ROUTINE_SCHEMA", "ROW", "ROW_COUNT", "ROW_NUMBER", "ROWCOUNT", "ROWGUIDCOL", "ROWID",
-         "ROWNUM", "ROWS", "RULE", "SAVE", "SAVEPOINT", "SCALE", "SCHEMA", "SCHEMA_NAME", "SCHEMAS", "SCOPE",
-         "SCOPE_CATALOG", "SCOPE_NAME", "SCOPE_SCHEMA", "SCROLL", "SEARCH", "SECOND", "SECOND_MICROSECOND", "SECTION",
-         "SECURITY", "SELECT", "SELF", "SENSITIVE", "SEPARATOR", "SEQUENCE", "SERIALIZABLE", "SERVER_NAME", "SESSION",
-         "SESSION_USER", "SET", "SETOF", "SETS", "SETUSER", "SHARE", "SHOW", "SHUTDOWN", "SIGNAL", "SIMILAR", "SIMPLE",
-         "SIZE", "SMALLINT", "SOME", "SONAME", "SOURCE", "SPACE", "SPATIAL", "SPECIFIC", "SPECIFIC_NAME",
-         "SPECIFICTYPE", "SQL", "SQL_BIG_RESULT", "SQL_BIG_SELECTS", "SQL_BIG_TABLES", "SQL_CALC_FOUND_ROWS",
-         "SQL_LOG_OFF", "SQL_LOG_UPDATE", "SQL_LOW_PRIORITY_UPDATES", "SQL_SELECT_LIMIT", "SQL_SMALL_RESULT",
-         "SQL_WARNINGS", "SQLCA", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "SQRT", "SSL",
-         "STABLE", "START", "STARTING", "STATE", "STATEMENT", "STATIC", "STATISTICS", "STATUS", "STDDEV_POP",
-         "STDDEV_SAMP", "STDIN", "STDOUT", "STORAGE", "STRAIGHT_JOIN", "STRICT", "STRING", "STRUCTURE", "STYLE",
-         "SUBCLASS_ORIGIN", "SUBLIST", "SUBMULTISET", "SUBSTRING", "SUCCESSFUL", "SUM", "SUPERUSER", "SYMMETRIC",
-         "SYNONYM", "SYSDATE", "SYSID", "SYSTEM", "SYSTEM_USER", "TABLE", "TABLE_NAME", "TABLES", "TABLESAMPLE",
-         "TABLESPACE", "TEMP", "TEMPLATE", "TEMPORARY", "TERMINATE", "TERMINATED", "TEXT", "TEXTSIZE", "THAN",
-         "THEN", "TIES", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TINYBLOB", "TINYINT", "TINYTEXT",
-         "TO", "TOAST", "TOP", "TOP_LEVEL_COUNT", "TRAILING", "TRAN", "TRANSACTION", "TRANSACTION_ACTIVE",
+         "ROWNUM", "ROWS", "RULE", "RUNSCRIPT", "SAVE", "SAVEPOINT", "SCALE", "SCHEMA", "SCHEMA_NAME", "SCHEMAS",
+         "SCOPE", "SCOPE_CATALOG", "SCOPE_NAME", "SCOPE_SCHEMA", "SCRIPT", "SCROLL", "SEARCH", "SECOND",
+         "SECOND_MICROSECOND", "SECTION", "SECURITY", "SELECT", "SELF", "SENSITIVE", "SEPARATOR", "SEQUENCE",
+         "SERIALIZABLE", "SERVER_NAME", "SESSION", "SESSION_USER", "SET", "SETOF", "SETS", "SETUSER", "SHARE", "SHOW",
+         "SHUTDOWN", "SIGNAL", "SIMILAR", "SIMPLE", "SIZE", "SMALLINT", "SOME", "SONAME", "SOURCE", "SPACE", "SPATIAL",
+         "SPECIFIC", "SPECIFIC_NAME", "SPECIFICTYPE", "SQL", "SQL_BIG_RESULT", "SQL_BIG_SELECTS", "SQL_BIG_TABLES",
+         "SQL_CALC_FOUND_ROWS", "SQL_LOG_OFF", "SQL_LOG_UPDATE", "SQL_LOW_PRIORITY_UPDATES", "SQL_SELECT_LIMIT",
+         "SQL_SMALL_RESULT", "SQL_WARNINGS", "SQLCA", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING",
+         "SQRT", "SSL", "STABLE", "START", "STARTING", "STATE", "STATEMENT", "STATIC", "STATISTICS", "STATUS",
+         "STDDEV_POP", "STDDEV_SAMP", "STDIN", "STDOUT", "STORAGE", "STRAIGHT_JOIN", "STRICT", "STRING", "STRUCTURE",
+         "STYLE", "SUBCLASS_ORIGIN", "SUBLIST", "SUBMULTISET", "SUBSTRING", "SUCCESSFUL", "SUM", "SUPERUSER",
+         "SYMMETRIC", "SYNONYM", "SYSDATE", "SYSID", "SYSTEM", "SYSTEM_USER", "TABLE", "TABLE_NAME", "TABLES",
+         "TABLESAMPLE", "TABLESPACE", "TEMP", "TEMPLATE", "TEMPORARY", "TERMINATE", "TERMINATED", "TEXT", "TEXTSIZE",
+         "THAN", "THEN", "TIES", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TINYBLOB", "TINYINT",
+         "TINYTEXT", "TO", "TOAST", "TOP", "TOP_LEVEL_COUNT", "TRAILING", "TRAN", "TRANSACTION", "TRANSACTION_ACTIVE",
          "TRANSACTIONS_COMMITTED", "TRANSACTIONS_ROLLED_BACK", "TRANSFORM", "TRANSFORMS", "TRANSLATE", "TRANSLATION",
          "TREAT", "TRIGGER", "TRIGGER_CATALOG", "TRIGGER_NAME", "TRIGGER_SCHEMA", "TRIM", "TRUE", "TRUNCATE", "TRUSTED",
          "TSEQUAL", "TYPE", "UESCAPE", "UID", "UNBOUNDED", "UNCOMMITTED", "UNDER", "UNDO", "UNENCRYPTED", "UNION",
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/component/SchemaElementCell.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/component/SchemaElementCell.kt
index c9b69db9..09ac0d93 100644
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/component/SchemaElementCell.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/component/SchemaElementCell.kt
@@ -13,7 +13,7 @@ class SchemaElementCell(
    deleteElement: (element: Schema) -> Unit
 ) : TextFieldTreeCell<Schema>() {
    private val tableMenu = ContextMenu().apply {
-      item("Rename") {
+      item("Rename table") {
          action {
             treeView.isEditable = true
             startEdit()
@@ -21,7 +21,7 @@ class SchemaElementCell(
          }
       }
 
-      item("Delete") {
+      item("Drop table") {
          action {
             deleteElement(item)
          }
@@ -29,7 +29,7 @@ class SchemaElementCell(
    }
 
    private val columnMenu = ContextMenu().apply {
-      item("Rename") {
+      item("Rename column") {
          action {
             treeView.isEditable = true
             startEdit()
@@ -37,7 +37,7 @@ class SchemaElementCell(
          }
       }
 
-      item("Delete") {
+      item("Drop column") {
          action {
             deleteElement(item)
          }
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/view/query/QueryResultView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/view/query/QueryResultView.kt
index 803c9ea9..c340faee 100644
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/view/query/QueryResultView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/database/view/query/QueryResultView.kt
@@ -63,7 +63,7 @@ class QueryResultView : View() {
          }
 
          button(graphic = FontIcon("fa-minus")) {
-            enableWhen(queryVM.schemaProperty.isNotNull)
+            enableWhen(queryVM.schemaProperty.isNotNull.and(table.selectionModel.selectedItemProperty().isNotNull))
 
             action {
                val selected = table.selectionModel.selectedItem
@@ -74,7 +74,7 @@ class QueryResultView : View() {
             }
          }
 
-         button(graphic = FontIcon("fa-check")) {
+         button(graphic = FontIcon("fa-floppy-o")) {
             enableWhen(queryVM.schemaProperty.isNotNull)
 
             action {