optimized layout a bit