Better layout, still not vertically aligned