Small bug fixes and ui changes