UI group block layout bugfix, other fixes