fixed alignments and borders/margins