cleand up a little bit and adjusted initUI