Added the last modifications and completed the app