Fix bug with saving payment method

Based on http://www.magentocommerce.com/boards/viewthread/287626/ thread "Payment methods do not save changes after upgrade to magento 1.7.0.2".
Обновил пункты самовывоза в СПб

Суровый хардкод :-(
Упс, поправил ковычку.
Fixed some block layout issues