updated layout to be more consistent