fully updated styling and formatting