multiple bug fixes and style improvements for the UI