minor bug fixes and ui improvements