Few fixes to stabilise front page