GUI layout now sucks less