UI changes

changed the UI
some small other changes