Adjusted the border and padding yet again, ready to move on