Added border and edit functionality