Issue: front page fixing