Updated to current best practice of one underscore for layout