more changes to layout & usability