User interface tweaks & use NSOrderedSet