cleaned up the app
Merge branch 'adapt'