Feature/cms styling