Added edit bar

Added edit bar on top of page.

Also fixed page-width to be 960px total again.