Changed layout a bit