Added borders and resizing