Working menu woop woop
Fix merge errors