Re-organized the navigation akin to orig. design.
Fixed a minor 1px gap.
Fixed #88
Fixed #80