last commit before major ui changes