Add _form partial, show template
Remove a couple of stray swap files