Changed layout a bit.