Added border
Added cursor