This is better, but I still think the “Edit Site” is too confusing for new users. Having “Edit Site” and “Edit Page” doesn’t make it clear what the difference is.

I propose the “Edit Site” be changed to “Edit Template.” There are a few other good options that come to mind, but the current labeling is not good enough.