view refactor
refactor models
view/controllers done