Fixing layout issues