Started cleanup for new design. Added nav.