Improved design of the application.