RS redesign - tweaks after review by RK