more updates
integrate controller + view