Update view / re-organize code.