Separation of view components into view.cpp
updated fix