updates on view
fixed merge conflicts
following basic layout