Fixed layout problems caused by Zend not recognising the decorators on some elements.

Signed-off-by: Magnus P White <mpw@ecs.soton.ac.uk>