Fixing alignments and some styling