Quick update
UI updates
Merge branch 'master' of https://github.com/cjs07/The-Eternal-Night