More template refactoring/moving. Tweaks to profile edit form.