Niko's ui changes