Working on GUI some more :D