Updated general template to use single template and share code
Removed fields from page saving
more work on admin view