Fixed bugs on new page