added grouper
made ui changes