fixed UI issues