Code Improvements

- Various cleanups, better namespacing
- Click-Handlers now defined in template
- UI for Post-Update phase