RS redesign - tweaks