Implementation of Issue #65 and Bug Fix #138

Also some CSS revisions for better viewing (min-width restrictions)