Lots of changes for the ui