Updated to use ENV admin user/pass.
Deleted.
Modified to use main layout.
Merge branch 'local'