Better layout, more buttons