Updated Controls

Updated controls to match Elise's requests