Tried to fix topbar, added upload options
Merge branch 'master' of https://github.com/sorja/bearded-ninja