Merge branch 'chats'
fixing small CSS issues
styled nav
Merge branch 'master' into chats