improved GUI, added more controls