Fixes Bugs and implements first grouped views