Zen Mode Fixes

Fix deep lnking #252