Further cleaning up of the front page