Miscellaneous attempts to fix the layout