cleaned up layout, removed fudge factors