Front page fixed.
Front page fixed.
Moar fixed.
Fix conflicts.