Merge fix

NewUI.css