Revert "Cleaned up the GUI."

This reverts commit 408de200999d3d24a3029da816a44e4f0a2728b5.
fixed issues in GUI