Faerdan's NanoUI update

Parts of Faedan's NanoUI update