Added border and margins

Doing cursor next