markup and styling
Merge branch 'popups' into dev