more menu stuff and removed unused stuff