Solve home page issue