more stuff

cleaner UI
imported existing Gen 6 stuff