added more UI stuff and reorganized classes