Popup Redesign
Merge branch 'New-CSS' into development