Added templates to admin pages
Merged and refarctored admin