Adding additional Q's and calculator UI