Make the UI work for various other commands

Please close #107 when this is merged