Starting to refactor the UI. Apps borked.