Final improvements to the application