Initial commit on movie player button fixes