Added singlediningview, refactoring and more