input fix and menu fix