Adding the borders and scroll layouts