organizing layout a bit