fix UI Problems