Refactoring of template tag; add fields to admin;