Fixed main page issue