Fixed a lot of alignment details