Minor Bugfixes; ScrapbookViewModel + View refactoring