HomePage fix 2.0