Cleanup structure
Add CSS