modify layout and colors, add links
Merge branch 'work'