changed layout to make more sense