layout & usability improvements