Improved android calculator