Styling and code update