Revamped Gui code a "bit" cleaner