Found and sorted the issue with the extra space on the the right, now need to go back and sort out the padding