Implemented group view, visual changes and bugfixes, code refactoring