Improved jobs layout