Front Page need some changes