Main page layout reworked.
Minor style fixes
Merge remote-tracking branch 'origin/master'