Improvements to save space and get a better overview at first look.