Fixing layout bug