GUI Optimization and Bug fix