Logic in the right place and cleaned the GUI