Added Control Page & Helpers