Improve layout when screen estate is not too big