Partially implement part of proceeding view, refactor and fix some bugs