Redid GUI layout