Moved comments UI into view model