Better layout for calculator controller