Code clean up and New page structuring