Updated navigation (incomplete), added generic styling, bug fixes)