small ui changes and bug fixes