Nano UI fix
Merge branch 'dev' of https://github.com/ApolloCoding/Apollo-Coding into dev