GUI Stuff commit 2