various tweaks for RWD