Updates the User Interface of the phase 1 profile screen.

This is a development merge to keep our branches in alignment.

NOTE: I am getting a test error in views.py line 38 (invalid syntax). We will need to resolve this prior to merging this into master.