#97 better UI