Some beautification?

- Changed markup
- CSS styles