[jan] Fix fatal errors in portal blocks (Bug #12303).
Tweak layout.