Fixing css.
Some more fancy css magic.
Add menu marking.
Merge remote-tracking branch 'origin/master'