Went back to the old layout with a minor adjustment.