Condense .toggle() statements and fix problem with Price Assignment option not showing. #1502