Fixed all the alignment issues