Updates

- Separated CSS
- Better markup

Closes #11
Closes #10