More styling and view changes