CSS refactor and reformat [MJ-449]