Added page2 changes and fixed some position flaws