Changed layout a little