Clean up the app
Add image support