Fixing layout a bit