Fixed stagining bugs in develop branch.