Implementation of Issue #65 and Bug Fix #138

Also some CSS revisions for better viewing (min-width restrictions)
Merge pull request #139 from gitcac/issue-65-138

Implementation of Issue #65 and Bug Fix #138