Cleanup part II
Switched out the current mediator implementation with on in my own superActor library (which is more advanced)
Fine tuning, part I,
added finish modal