Added more xxxview modifications