Added a few controls