Finish the calulator function and finish the display set