Check if e exists
Merge branch 'master' into inline-links
Fixed broken layout :/