updated front page design
merge