Feature/junhao refactor and view headers