Fixes to navigation and abstracting colors.
More refactoring of navitation and javascript.