RS redesign - tweaks after review by Chad