Improve presentation on smaller screens (#EASYMOCK-124)