Added the finishing touches to the application