Plain/Grouped view added, minor fixes and improvements
Small re-organization and bugfixes