Added programming-view, onClickListeners and other changes