CON-95 | S:MWH Adding official - frontent refactor