Feature/improve styles