Layout improvements for RWD