Refactored views a bit, got user view a bit closer to working.