Layout improvements for RWD #2