Changed layout to be less ugly