Lots of changes to the UI