Modifying layout a bit.