Added Flatly UI, and tidied up a lot of the views and stuff