Lots of changes to ui