general ui improvements and bug fixes