Usability updates, cleans style