tweaked ui, renamed things