HomePage tidy up