Merged with Dev
Fix Sytling for View Groups