Some cleanup
Add a ton of design and styling