Added Borders
merge fix