some ui improvements and bug fixes