Updates to styling and format