Move View/Discharge inline

refs #129