Fixing layout bug on layout page