Next

Fixing layout issues