View refactor out of Push.control

- same "package" type pattern as used with modes
- removed unused global variables as well