diff --git a/README.md b/README.md
index 53b1ce5..f9b389b 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ Easy to use desktop SQL widget
 ![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/1.JPG)
 ![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/2.JPG)
 ![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/3.JPG)
+![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/4.JPG)
+![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/5.JPG)
+![alt text](https://github.com/MoDevby/SQL-Widget/blob/master/Sql%20Widget/ScreenShots/6.JPG)
 
 ### This Project is using the following open source libraries:
 * [MaterialDesignInXamlToolkit](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit) under the MIT license.   
diff --git a/Sql Widget/Entities/ConditionElement.cs b/Sql Widget/Entities/ConditionElement.cs
deleted file mode 100644
index 291734e..0000000
--- a/Sql Widget/Entities/ConditionElement.cs	
+++ /dev/null
@@ -1,18 +0,0 @@
-using Sql_Widget.Helper;
-
-namespace Sql_Widget.Entities
-{
-	class ConditionElement
-	{
-		public ConditionElement()
-		{
-			SelectedField = string.Empty;
-			SelectedOerator = 0;
-			Value = string.Empty;
-		}
-		public string SelectedField { get; set; }
-		public CompareOperators SelectedOerator { get; set; }
-		public string Value { get; set; }
-		public RelationOperators NextLineOperator{ get; set; }
-	}
-}
diff --git a/Sql Widget/Help.md b/Sql Widget/Help.md
index fd10e6a..e747f1a 100644
--- a/Sql Widget/Help.md	
+++ b/Sql Widget/Help.md	
@@ -4,10 +4,6 @@
 	* F5: Execute.
 	* Ctrl+Tab: Change the Tab.
 
-## Select Tab:
-	* Ctrl+Right: Add selected fields to the select clause.
-	* Ctrl+Left: Remove selected fields from the select clause.
-
 ## Result Page:
 	* F5: Re-Execute.
 
diff --git a/Sql Widget/Helper/Enums.cs b/Sql Widget/Helper/Enums.cs
deleted file mode 100644
index ad37e6f..0000000
--- a/Sql Widget/Helper/Enums.cs	
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Sql_Widget.Helper
-{
-	public enum CompareOperators
-	{
-		Equal = 1,
-		NotEqual,
-		Greater,
-		Less,
-		GreaterOrEqual,
-		LessOrEqual,
-		Like
-	}
-	public enum RelationOperators
-	{
-		AND = 1,
-		OR
-	}
-
-}
diff --git a/Sql Widget/Models/OperatorsModel.cs b/Sql Widget/Models/OperatorsModel.cs
deleted file mode 100644
index a09c9d2..0000000
--- a/Sql Widget/Models/OperatorsModel.cs	
+++ /dev/null
@@ -1,29 +0,0 @@
-using Sql_Widget.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Sql_Widget.Models
-{
-	class OperatorsModel
-	{
-		public static Dictionary<CompareOperators, string> GetCompareOperators()
-		{
-			return new Dictionary<CompareOperators, string>
-			{
-				{ CompareOperators.Equal , "=" },
-				{ CompareOperators.NotEqual, "<>" },
-				{ CompareOperators.Greater , ">" },
-				{ CompareOperators.Less , "<" },
-				{ CompareOperators.GreaterOrEqual , ">=" },
-				{ CompareOperators.LessOrEqual , "<=" },
-				{ CompareOperators.Like , "LIKE" },
-			};
-		}
-
-		public static List<RelationOperators> GetReleationsOperators()
-		{
-			return Enum.GetValues(typeof(RelationOperators)).Cast<RelationOperators>().ToList();
-		}
-	}
-}
diff --git a/Sql Widget/ScreenShots/0.JPG b/Sql Widget/ScreenShots/0.JPG
index 4dc3357..90bb0d6 100644
Binary files a/Sql Widget/ScreenShots/0.JPG and b/Sql Widget/ScreenShots/0.JPG differ
diff --git a/Sql Widget/ScreenShots/1.JPG b/Sql Widget/ScreenShots/1.JPG
index a143727..bd3a91a 100644
Binary files a/Sql Widget/ScreenShots/1.JPG and b/Sql Widget/ScreenShots/1.JPG differ
diff --git a/Sql Widget/ScreenShots/2.JPG b/Sql Widget/ScreenShots/2.JPG
index 717651f..61242a2 100644
Binary files a/Sql Widget/ScreenShots/2.JPG and b/Sql Widget/ScreenShots/2.JPG differ
diff --git a/Sql Widget/ScreenShots/3.JPG b/Sql Widget/ScreenShots/3.JPG
index 71a8d98..c662775 100644
Binary files a/Sql Widget/ScreenShots/3.JPG and b/Sql Widget/ScreenShots/3.JPG differ
diff --git a/Sql Widget/ScreenShots/4.JPG b/Sql Widget/ScreenShots/4.JPG
new file mode 100644
index 0000000..80c569f
Binary files /dev/null and b/Sql Widget/ScreenShots/4.JPG differ
diff --git a/Sql Widget/ScreenShots/5.JPG b/Sql Widget/ScreenShots/5.JPG
new file mode 100644
index 0000000..7877583
Binary files /dev/null and b/Sql Widget/ScreenShots/5.JPG differ
diff --git a/Sql Widget/ScreenShots/6.JPG b/Sql Widget/ScreenShots/6.JPG
new file mode 100644
index 0000000..da4ca4f
Binary files /dev/null and b/Sql Widget/ScreenShots/6.JPG differ
diff --git a/Sql Widget/Sql Widget.csproj b/Sql Widget/Sql Widget.csproj
index 2d818db..8624617 100644
--- a/Sql Widget/Sql Widget.csproj	
+++ b/Sql Widget/Sql Widget.csproj	
@@ -86,21 +86,12 @@
     <Compile Include="Views\Controls\HistoryControl.xaml.cs">
       <DependentUpon>HistoryControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Controls\SelectControl.xaml.cs">
-      <DependentUpon>SelectControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\Controls\ServerControl.xaml.cs">
       <DependentUpon>ServerControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Controls\WhereControl.xaml.cs">
-      <DependentUpon>WhereControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Helper\ButtonsCommand.cs" />
-    <Compile Include="Entities\ConditionElement.cs" />
     <Compile Include="Helper\Converters.cs" />
-    <Compile Include="Helper\Enums.cs" />
     <Compile Include="Entities\HistoryItem.cs" />
-    <Compile Include="Models\OperatorsModel.cs" />
     <Compile Include="Entities\TableColumn.cs" />
     <Compile Include="Models\DBModel.cs" />
     <Compile Include="Models\QueryModel.cs" />
@@ -123,18 +114,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Controls\SelectControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\Controls\ServerControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Controls\WhereControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Sql Widget/ViewModels/MainWindowVM.cs b/Sql Widget/ViewModels/MainWindowVM.cs
index ada8a31..0634188 100644
--- a/Sql Widget/ViewModels/MainWindowVM.cs	
+++ b/Sql Widget/ViewModels/MainWindowVM.cs	
@@ -18,8 +18,6 @@ class MainWindowVM : INotifyPropertyChanged
 #pragma warning disable 0067
 		public event PropertyChangedEventHandler PropertyChanged;
 #pragma warning restore 0067
-		private string _selectedDB;
-		private string _selectedTable;
 		private DBModel _dbModel = new DBModel();
 
 		#region Properties
@@ -47,43 +45,16 @@ public bool UseWinAuth
 		public string UserName { get; set; }
 		#endregion
 		#region DB
+		public string SelectedDB { get; set; }
 		public List<string> DBsList { get; set; } = new List<string>();
-		public List<string> TablesList { get; set; } = new List<string>();
-		public string SelectedDB
-		{
-			get { return _selectedDB; }
-			set
-			{
-				_selectedDB = value;
-				AsyncUpdateTables();
-				SelectedTable = null;
-			}
-		}
-		public string SelectedTable
-		{
-			get { return _selectedTable; }
-			set { _selectedTable = value; IntiateFields(); }
-		}
-		public bool SelectTablesIsEnabled => TablesList.Any();
-		public List<TableColumn> Fields { get; set; } = new List<TableColumn>();
-		public bool ComponentsEnabled => Fields.Count() > 1;
 		#endregion
 		#region Query
 		public string QueryContent { get; set; }
 		public string ExecutableQuery { get; set; }
-		public bool QueryEnabled => ValidConnection && !string.IsNullOrWhiteSpace(SelectedDB);
-		private bool IsValidExecutableQuery => !string.IsNullOrWhiteSpace(SelectedDB) && !string.IsNullOrWhiteSpace(ExecutableQuery);
-		#endregion
-		#region Select
-		public List<TableColumn> VisibleFields => Fields.Where(x => !SelectedFields.Contains(x)).ToList();
-		public List<TableColumn> SelectedFields { get; set; } = new List<TableColumn>();
-		private bool IsValidSelect => SelectedFields.Any();
-		#endregion
-		#region Where
-		public List<TableColumn> WhereFields { get { return Fields.Where(a => a.Name != "*").ToList(); } }
-		public List<ConditionElement> Conditions { get; set; } = new List<ConditionElement> { new ConditionElement() };
-		public Dictionary<CompareOperators, string> CompareOperators { get; set; }
-		public List<RelationOperators> RelationOperators { get; set; }
+		public bool CanExecute => ValidConnection && !string.IsNullOrWhiteSpace(SelectedDB) &&
+				(!string.IsNullOrWhiteSpace(QueryContent) || SelectedTab.Header.ToString() != "Query");
+		public bool IsValidExecutableQuery => ValidConnection &&
+			!string.IsNullOrWhiteSpace(SelectedDB) && !string.IsNullOrWhiteSpace(ExecutableQuery);
 		#endregion
 		#region History
 		public List<HistoryItem> HistoryItems { get; set; } = new List<HistoryItem>();
@@ -93,24 +64,14 @@ public string SelectedTable
 		#region Methods
 		public MainWindowVM()
 		{
-			CompareOperators = OperatorsModel.GetCompareOperators();
-			RelationOperators = OperatorsModel.GetReleationsOperators();
-
 			VerfiyServer();
 		}
 
-		private async void IntiateFields()
-		{
-			SelectedFields = new List<TableColumn>();
-			Conditions = new List<ConditionElement> { new ConditionElement() };
-			Fields = new List<TableColumn> { new TableColumn { Name = "*", Position = 0, Type = "*" } }
-				.Concat(await TableColumnsModel.GetTableColumns(SelectedDB, SelectedTable)).ToList();
-		}
-
 		private async void VerfiyServer()
 		{
 			ServerName = Properties.Settings.Default.Server;
 			UserName = Properties.Settings.Default.UserName;
+
 			ServerMessage = "Connecting....";
 
 			if (await _dbModel.CheckConnection())
@@ -118,7 +79,6 @@ private async void VerfiyServer()
 				ValidConnection = true;
 				ServerMessage = "Connected!";
 				AsyncLoadDBs();
-				IntiateFields();
 			}
 			else
 			{
@@ -129,6 +89,8 @@ private async void VerfiyServer()
 
 		private async void AsyncLoadDBs()
 		{
+			SelectedDB = null;
+			_dbModel.InvalidateCache();
 			try
 			{
 				DBsList = await _dbModel.GetAllDBs();
@@ -141,59 +103,6 @@ private async void AsyncLoadDBs()
 			}
 		}
 
-		private async void AsyncUpdateTables()
-		{
-			if (!string.IsNullOrWhiteSpace(_selectedDB))
-				try
-				{
-					TablesList = await TablesModel.GetAllTables(SelectedDB);
-					return;
-				}
-				catch (Exception)
-				{
-					ServerMessage = $"Error, Couldn't Load The Tables for {SelectedDB}!";
-					ValidConnection = false;
-				}
-			TablesList = new List<string>();
-		}
-
-		private string GetSelectQuery()
-		{
-			var Query = string.Empty;
-			if (IsValidSelect)
-			{
-				var fields = string.Join(", ", SelectedFields.Select(x => x.Name));
-				Query = $"SELECT {fields}{Environment.NewLine}FROM {SelectedTable}";
-
-				var whereConditions = Conditions.Where(x => x.SelectedField != "" && x.SelectedOerator != 0);
-				Query += ConstructWhereClause(whereConditions);
-			}
-			return Query;
-		}
-
-		private string ConstructWhereClause(IEnumerable<ConditionElement> whereConditions)
-		{
-			if (!whereConditions.Any()) return null;
-			var where = Environment.NewLine + "Where ";
-			var index = 0;
-			whereConditions.ToList().ForEach(condition =>
-			{
-				where += condition.SelectedField + CompareOperators.First(x => x.Key == condition.SelectedOerator).Value;
-				where += IsStringType(condition.SelectedField) && condition.Value != "null"
-							? string.IsNullOrEmpty(condition.Value) ? "" : $"'{condition.Value}'"
-							: string.IsNullOrWhiteSpace(condition.Value) ? "null" : condition.Value;
-				if (index < whereConditions.Count() - 1)
-					where += condition.NextLineOperator == 0 ? $" {RelationOperators.First()} " : $" {condition.NextLineOperator} ";
-				index++;
-			});
-			return where;
-		}
-		private bool IsStringType(string fieldName)
-		{
-			var type = Fields.FirstOrDefault(x => x.Name == fieldName).Type;
-			return type.Contains("char") || type.Contains("uniqueidentifier") || type.Contains("date");
-		}
-
 		private async void AddToHistory(string db, string query, ResultVM resultVm)
 		{
 			var historyItem = new HistoryItem
@@ -237,24 +146,13 @@ public ICommand SaveServerCommand
 					Properties.Settings.Default.UserName = UserName;
 					Properties.Settings.Default.Password = (obj as PasswordBox).Password;
 					Properties.Settings.Default.Save();
-					ResetCacheCommand.Execute("");
+					VerfiyServer();
 				});
 			}
 		}
 		#endregion
 		#region DB Bar
-		public ICommand ResetCacheCommand
-		{
-			get
-			{
-				return new ButtonsCommand((object obj) =>
-				{
-					SelectedDB = null;
-					_dbModel.InvalidateCache();
-					VerfiyServer();
-				});
-			}
-		}
+
 		public ICommand HelpCommand
 		{
 			get
@@ -285,53 +183,11 @@ public ICommand SelectDBCommand
 			{
 				return new ButtonsCommand((object obj) =>
 				{
-					var db = (string)obj;
-					SelectedDB = db;
-				});
-			}
-		}
-		#endregion
-		#region Select
-		public ICommand AddFieldCommand
-		{
-			get
-			{
-				return new ButtonsCommand((object obj) =>
-				{
-					var list = (ListBox)obj;
-					foreach (TableColumn item in list.SelectedItems)
-					{
-						SelectedFields.Add(item);
-					}
-					SelectedFields = new List<TableColumn>(SelectedFields);
-				});
-			}
-		}
-		public ICommand RemoveFieldCommand
-		{
-			get
-			{
-				return new ButtonsCommand((object obj) =>
-				{
-					var list = (ListBox)obj;
-					foreach (TableColumn item in list.SelectedItems)
-					{
-						SelectedFields.Remove(item);
-					}
-					SelectedFields = new List<TableColumn>(SelectedFields);
-				});
-			}
-		}
-		#endregion
-		#region Where
-		public ICommand AddConditionCommand
-		{
-			get
-			{
-				return new ButtonsCommand((object obj) =>
-				{
-					Conditions.Add(new ConditionElement());
-					Conditions = new List<ConditionElement>(Conditions);
+					var comboBox = (ComboBox)obj;
+
+					if (!DBsList.Contains(comboBox.Text))
+						comboBox.Text = "";
+					SelectedDB = comboBox.Text;
 				});
 			}
 		}
@@ -348,9 +204,6 @@ public ICommand ExecuteCommand
 						case "Query":
 							ExecutableQuery = QueryContent;
 							break;
-						case "SELECT":
-							ExecutableQuery = GetSelectQuery();
-							break;
 						case "History":
 							ExecutableQuery = string.Join(";", HistoryItems.Where(x => x.Selected).Select(x => x.Query));
 							break;
@@ -381,10 +234,6 @@ public ICommand ClearCommand
 						case "Query":
 							QueryContent = string.Empty;
 							break;
-						case "SELECT":
-							SelectedFields = new List<TableColumn>();
-							Conditions = new List<ConditionElement> { new ConditionElement() };
-							break;
 						case "History":
 							HistoryItems.ForEach(x => x.Selected = false);
 							HistoryItems = new List<HistoryItem>(HistoryItems);
diff --git a/Sql Widget/Views/Controls/DBandTableControl.xaml b/Sql Widget/Views/Controls/DBandTableControl.xaml
index 3b36f42..807732f 100644
--- a/Sql Widget/Views/Controls/DBandTableControl.xaml	
+++ b/Sql Widget/Views/Controls/DBandTableControl.xaml	
@@ -7,48 +7,27 @@
 	<!--<GroupBox Header="DB and Table" HorizontalAlignment="Stretch">-->
 	<Grid HorizontalAlignment="Stretch">
 		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto"/>
-			<ColumnDefinition Width="Auto"/>
-			<ColumnDefinition Width="Auto"/>
-			<ColumnDefinition Width="Auto"/>
 			<ColumnDefinition Width="*"/>
 			<ColumnDefinition Width="Auto"/>
+			<ColumnDefinition Width="Auto"/>
 		</Grid.ColumnDefinitions>
 
-		<TextBlock Grid.Column="0" Text="DBs:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5"/>
-		<ComboBox Grid.Column="1"  IsTextSearchEnabled="True" IsEditable="True" MinWidth="100" Margin="5"
+		<!--<TextBlock Grid.Column="0" Text="DBs:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5"/>-->
+		<ComboBox Grid.Column="0"  IsTextSearchEnabled="True" IsEditable="True" MinWidth="100" Margin="5"
 					  materialDesign:HintAssist.Hint="Select DB" Name="DBSelector" 
 					  SelectedItem="{Binding SelectedDB,UpdateSourceTrigger=LostFocus}" ItemsSource="{Binding DBsList,Mode=OneWay}"
 					  IsEnabled="{Binding ValidConnection,Mode=OneWay}">
 			<ComboBox.InputBindings>
-				<KeyBinding Key="Enter" Command="{Binding SelectDBCommand}" CommandParameter="{Binding Text, ElementName=DBSelector}"/>
+				<KeyBinding Key="Enter" Command="{Binding SelectDBCommand}" CommandParameter="{Binding ElementName=DBSelector}"/>
 			</ComboBox.InputBindings>
 		</ComboBox>
 
-		<TextBlock Grid.Column="2" Margin="5" Text="Tables:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-		<ComboBox Grid.Column="3"  IsTextSearchEnabled="True" IsEditable="True" MinWidth="100" 
-					  materialDesign:HintAssist.Hint="Select Table" Margin="5"
-					  SelectedItem="{Binding SelectedTable}" ItemsSource="{Binding TablesList,Mode=OneWay}" 
-					  IsEnabled="{Binding SelectTablesIsEnabled,Mode=OneWay}"
-					  KeyboardNavigation.TabNavigation="Local" >
-			<ComboBox.ItemsPanel>
-				<ItemsPanelTemplate>
-					<VirtualizingStackPanel />
-				</ItemsPanelTemplate>
-			</ComboBox.ItemsPanel>
-		</ComboBox>
-
-		<DockPanel Grid.Column="4" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Stretch">
-			<Button Margin="5,0" ToolTip="Clear DBs/Tables Cache" Command="{Binding ResetCacheCommand}" IsTabStop="False"
-					Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}" DockPanel.Dock="Left" HorizontalAlignment="Left">
-				<materialDesign:PackIcon Kind="Refresh" Height="24" Width="24" />
-			</Button>
-			<Button Margin="5,0" ToolTip="Help (F1)" Command="{Binding HelpCommand}" IsTabStop="False"
+		<Button Grid.Column="1" Margin="5" VerticalAlignment="Center" ToolTip="Help (F1)" Command="{Binding HelpCommand}" IsTabStop="False"
 					Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}" DockPanel.Dock="Right" HorizontalAlignment="Right">
-				<materialDesign:PackIcon Kind="Help" Height="24" Width="24"/>
-			</Button>
-		</DockPanel>
-		<Button Grid.Column="5" Margin="5" ToolTip="Close (ALT+F4)" Command="{Binding CloseCommand}" IsTabStop="False"
+			<materialDesign:PackIcon Kind="Help" Height="24" Width="24"/>
+		</Button>
+
+		<Button Grid.Column="2" Margin="5" ToolTip="Close (ALT+F4)" Command="{Binding CloseCommand}" IsTabStop="False"
 					CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
 					Background="IndianRed" HorizontalAlignment="Right">
 			<materialDesign:PackIcon Kind="Close" Height="24" Width="24" />
diff --git a/Sql Widget/Views/Controls/SelectControl.xaml b/Sql Widget/Views/Controls/SelectControl.xaml
deleted file mode 100644
index 3e12771..0000000
--- a/Sql Widget/Views/Controls/SelectControl.xaml	
+++ /dev/null
@@ -1,41 +0,0 @@
-<UserControl x:Class="Sql_Widget.Views.Controls.SelectControl"
-			xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			xmlns:helper="clr-namespace:Sql_Widget.Helper"
-			
-			xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-			 Background="{DynamicResource MaterialDesignPaper}">
-	<UserControl.InputBindings>
-		<KeyBinding Key="Right" Modifiers="Ctrl" Command="{Binding AddFieldCommand}" CommandParameter="{x:Reference Name=FieldsList}"/>
-		<KeyBinding Key="Left" Modifiers="Ctrl" Command="{Binding RemoveFieldCommand}" CommandParameter="{x:Reference Name=SelectedFieldsList}"/>
-	</UserControl.InputBindings>
-	<GroupBox IsEnabled="{Binding ComponentsEnabled}">
-		<GroupBox.Header>
-			<TextBlock Text="Select Fields" HorizontalAlignment="Center"/>
-		</GroupBox.Header>
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*"/>
-				<ColumnDefinition/>
-				<ColumnDefinition Width="*"/>
-			</Grid.ColumnDefinitions>
-
-			<ListBox x:Name="FieldsList" Margin="5" SelectionMode="Multiple" Width="150" VerticalAlignment="Stretch"
-					 ItemsSource="{Binding VisibleFields, Mode=OneWay}" DisplayMemberPath="Name" />
-			<StackPanel Orientation="Vertical" Grid.Column="1" VerticalAlignment="Center">
-				<Button Command="{Binding AddFieldCommand}" CommandParameter="{x:Reference Name=FieldsList}" 
-						Margin="5,10" IsTabStop="False" ToolTip="Add to Select Clause (CTRL+Right)"
-						Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
-					<materialDesign:PackIcon Kind="ArrowRight" Height="24" Width="24" />
-				</Button>
-				<Button Command="{Binding RemoveFieldCommand}" CommandParameter="{x:Reference Name=SelectedFieldsList}" 
-						Margin="5,10" IsTabStop="False" ToolTip="Remove From Select Clause (CTRL+Left)"
-						Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
-					<materialDesign:PackIcon Kind="ArrowLeft" Height="24" Width="24" />
-				</Button>
-			</StackPanel>
-			<ListBox x:Name="SelectedFieldsList" Margin="5" SelectionMode="Multiple" Grid.Column="2" Width="150"
-					 ItemsSource="{Binding SelectedFields, Mode=OneWay}" DisplayMemberPath="Name"  VerticalAlignment="Stretch"/>
-		</Grid>
-	</GroupBox>
-</UserControl>
diff --git a/Sql Widget/Views/Controls/SelectControl.xaml.cs b/Sql Widget/Views/Controls/SelectControl.xaml.cs
deleted file mode 100644
index 47cb899..0000000
--- a/Sql Widget/Views/Controls/SelectControl.xaml.cs	
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace Sql_Widget.Views.Controls
-{
-	/// <summary>
-	/// Interaction logic for SelectControl.xaml
-	/// </summary>
-	public partial class SelectControl : UserControl
-	{
-		public SelectControl()
-		{
-			InitializeComponent();
-		}
-	}
-}
diff --git a/Sql Widget/Views/Controls/WhereControl.xaml b/Sql Widget/Views/Controls/WhereControl.xaml
deleted file mode 100644
index 33e639e..0000000
--- a/Sql Widget/Views/Controls/WhereControl.xaml	
+++ /dev/null
@@ -1,55 +0,0 @@
-<UserControl x:Class="Sql_Widget.Views.Controls.WhereControl"
-			xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 
-			xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-			Background="{DynamicResource MaterialDesignPaper}">
-	<UserControl.Resources>
-		<DataTemplate x:Key="ConditionElement">
-			<Grid Margin="5" VerticalAlignment="Center"  HorizontalAlignment="Stretch">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition/>
-					<ColumnDefinition/>
-					<ColumnDefinition/>
-				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition/>
-					<RowDefinition/>
-				</Grid.RowDefinitions>
-
-				<ComboBox ItemsSource="{Binding DataContext.WhereFields,ElementName=DummyElement,Mode=OneWay}" Grid.Column="0" VerticalAlignment="Center" 
-						  SelectedValue="{Binding SelectedField,UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Name" DisplayMemberPath="Name" IsEditable="True" MinWidth="100" Margin="5"
-						   materialDesign:HintAssist.Hint="Field"/>
-
-				<ComboBox ItemsSource="{Binding DataContext.CompareOperators,ElementName=DummyElement,Mode=OneTime }" Grid.Column="1" VerticalAlignment="Center"
-						  SelectedValue="{Binding SelectedOerator,UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" MinWidth="50" Margin="5"
-						   materialDesign:HintAssist.Hint="Operator"/>
-
-				<TextBox Text="{Binding Value,UpdateSourceTrigger=PropertyChanged}" Grid.Column="2" VerticalAlignment="Center" Margin="5" MinWidth="100"  materialDesign:HintAssist.Hint="Value"/>
-
-				<ComboBox ItemsSource="{Binding DataContext.RelationOperators,ElementName=DummyElement,Mode=OneTime}" Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" 
-						  SelectedValue="{Binding NextLineOperator,UpdateSourceTrigger=PropertyChanged}" IsEditable="True" MinWidth="50"  Margin="5" />
-			</Grid>
-		</DataTemplate>
-	</UserControl.Resources>
-	<GroupBox IsEnabled="{Binding ComponentsEnabled}" >
-		<GroupBox.Header>
-			<TextBlock Text="Where Clause" HorizontalAlignment="Center"/>
-		</GroupBox.Header>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="*"/>
-				<RowDefinition Height="Auto"/>
-			</Grid.RowDefinitions>
-			<ListBox Margin="5" ItemTemplate="{StaticResource ConditionElement}" ItemsSource="{Binding Conditions}" Grid.Row="0"
-				HorizontalAlignment="Stretch"/>
-
-			<FrameworkElement  Name="DummyElement" Visibility="Collapsed"/>
-
-			<Button VerticalAlignment="Top" Foreground="ForestGreen" FontSize="20" 
-					Style="{StaticResource InvisButton}" Command="{Binding AddConditionCommand}" Grid.Row="1">
-				<materialDesign:PackIcon Kind="Plus" Height="24" Width="24" />
-			</Button>
-		</Grid>
-	</GroupBox>
-</UserControl>
diff --git a/Sql Widget/Views/Controls/WhereControl.xaml.cs b/Sql Widget/Views/Controls/WhereControl.xaml.cs
deleted file mode 100644
index 1b80382..0000000
--- a/Sql Widget/Views/Controls/WhereControl.xaml.cs	
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace Sql_Widget.Views.Controls
-{
-	/// <summary>
-	/// Interaction logic for WhereControl.xaml
-	/// </summary>
-	public partial class WhereControl : UserControl
-	{
-		public WhereControl()
-		{
-			InitializeComponent();
-		}
-	}
-}
diff --git a/Sql Widget/Views/MainWindow.xaml b/Sql Widget/Views/MainWindow.xaml
index adc2d7d..2a5af72 100644
--- a/Sql Widget/Views/MainWindow.xaml	
+++ b/Sql Widget/Views/MainWindow.xaml	
@@ -43,15 +43,6 @@
 							 HorizontalAlignment="Stretch" TextWrapping="Wrap" AcceptsReturn="True"
 							 Foreground="{DynamicResource MaterialDesignBody}"/>
 						</TabItem>
-						<TabItem Header="SELECT" IsTabStop="False">
-							<StackPanel Orientation="Horizontal" Height="300">
-								<myControls:SelectControl />
-								<myControls:WhereControl />
-							</StackPanel>
-						</TabItem>
-						<!--<TabItem Header="UPDATE" IsTabStop="False" Visibility="Collapsed" />
-						<TabItem Header="INSERT" IsTabStop="False" Visibility="Collapsed"/>
-						<TabItem Header="DELETE" IsTabStop="False" Visibility="Collapsed"/>-->
 						<TabItem Header="History" IsTabStop="False">
 							<myControls:HistoryControl Height="300"/>
 						</TabItem>
@@ -66,7 +57,7 @@
 						</Grid.ColumnDefinitions>
 
 						<Button Content="Execute" Grid.Column="0" Command="{Binding ExecuteCommand}" Margin="10,0" Padding="5" ToolTip="(F5)"
-								 IsEnabled="{Binding QueryEnabled,Mode=OneWay}"/>
+								 IsEnabled="{Binding CanExecute,Mode=OneWay}"/>
 						<Button Content="Clear" Grid.Column="1" Command="{Binding ClearCommand}" Margin="10,0" Padding="5" ToolTip="Clear current tab content"/>
 					</Grid>
 				</StackPanel>