Add templator support and move login pages in files
remove trailing spaces