Add fragments to manifest and some menu adjustments