layout & usability updates