Merge "Added a disabled button and a second text edit in View / Controls"