removed viewmodel layer, started work on refactoring view layer.