Made improvments to app
TODO