altered order of layout to make more sense