UI updates/dummies
Merge branch 'master' of https://github.com/abertrand13/Sardines
blah blah