readded border and margins