Tweaks in prep for responsive layouts