Improved Application-Calculator