Feature/controlpage