Inbox update

Fixed a couple of issues in inbox