Modify Controller and Display