Publishing popup enchancements

Fixes: #569, #568