Hopefully this fixes the app to make it more usable on a mobile device.
Merge branch 'development'