lots of styling
lots of updates to views, fixed profile update form submit
fixed merge conf