CON-1073 | Changes for styling