Minor changes

Added phone back to user, not sure how it got removed. Also homogenized
nav links and reordered for logical flow.