Tidy up front page wrapping