main layout completed, tested on Chrome and IE11
Merge branch 'colors'