[WIP] Refactor Markup

Issue #1 

#### TODO:

- [ ] Add conditional html for IE browser compatibility
- [ ] Refactor