Updated some controlls