Added some controls