various structural fixes, style link on popups