Fixed a few issues in the markup