cahnged UI, more commands, and refactored code