This is a massive commmit, sorry
Merge pull request #32 from Zehhu/ui-work

This is a massive commmit, sorry