Rearrange layout/change over to percentages