Bugfix for GCP-6152 + Additional Styling changes for popup windows