Tightening up Home Page