New UI Some bug fixes left