Update: Improving GUI and SQL Query