Remove unused nav
Refactor mailbox
Refactor for optional box params in client