minor UI improvements and bug fixes