Refractored views from core to users