Improve styling and content