Fixing the layouts of various things