[JRO] View cleanup

To work with former legacy styles and avoid redundancy