new changes to UI and other little fixes