Finalised frontpage and corrected nav-bar