Committing a less broken version of the app. The last commit seemed to
have broken various elements in the application.