CON-804 | Style and cr:after changes