Add correct css classes / change formatting