updated controller view design, need to refactor later