Polished UI and supported calculation