Fixed shipping and setup main menu
fixed shipping and setup main menu (for real this time)