Worked on the new ui
Added support for property grouping