Fixed a few issues
Removed stray line (from mock up)