CLI: tweaked commandline, removed vimbutton