RS redesign - more tweaks