Refactor tools views, util, etc