Refactored Mediator module; redisigned navigation in popup