Fixing bad layout