Bugfixes and basic tests

updated layouts and tested basic service