refractored views
loads in dashboard