More styling and updating