some ui changes and bug fixes