Adding containers around the password resets and confirmation views

Didn't actual fix the pieces form yet but this contains a bunch of fixes.