Added Pump switch

Cleaned up some formatting also