show page formatting..still playing with grid
New grid
fixing merge conflicts
fixed merge conflicts