Merge "Move View related methods to helper class"