UI tuneups according to feedback from Tero