small ui and model refactor