Styling changes and slight fixes