Resolves alignment issues and simplifies markup
Merge pull request #6 from pwim/clean-up-layout

Resolves alignment issues and simplifies markup