added mnemorics to UI, removed unused code