Finished update view and controller
finished refactor
Finished tweaks
sec