Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev