further ui improvements