Improve layout (bugfix) for mid range screens