revert colorscheme, misc GUI organization