reorganized and prettyfied the GUI