Inbox Initial and some text and style changes
Merge the changes