refactored viewmodels and views
added viewmodel for fillup view
draft version of history