Merge remote-tracking branch 'origin/develop' into develop
Made some quick updates to the UI, cleaned up some dependencies issues. The app should be running clean.