Changed layout to what we want