Try to fix menu and layout