added basic user profile view and made minor tweaks
completed merge