Inbox added + minor fixes