Merge pull request #1 from OrangeeWeb/master

Update Layout
Revert few accidental changes
Header links, small change