Improved design of application