New UI + squashing support