Moved round view out into separate class

And ViewModel