Started work on "better" gui components