Decorator to ease creation of small text views
Minor reordering

We might want to get rid of zserver patching later