Feature/fixed styles