Improve and tidy UI, minor bug fixes