front page fixed
merged