Got rid of border issue in layout