Major update to styling and content