Lots of ui improvements and adding groups.