Registration form and some template cleaning