Fixed some layout issues and addressed issue #1

see commits and #1