Refractored/Added Views