added border and margins