Some more work on front page