Fixed bugs in first page