UI pretty fixes and all. Tidied up content to less pages