@jandt-desy This resolves a number of layout issues. Should be safe to merge.
Related to #260 (closed)