Clean up and new front page...