Fix menu and collect forms