More rearrangement, expunging front page template, etc.