Better layout and minor fixes to better merge