Added tweaks to RWD