fixed UI issues before PROD Deployment