RS redesign - final tweaks before review