Tweaked placement of new classes