Polished up the controlls