Fixed menu z-index for proper display, fixed buttons to make Type 1 primary by default and other not