Fixes for Issues #3 and #8

Fixes for broken navigation and calendar at 767px-960px