Styling and some edits