7 fixing breaks on ui