Added a lot more UI

Hope WebStorm haven't messed up Git... :S