design changes for rest of pages
minor changes
fixed merge conflicts