Merged changes to viewcotroller