Fixed some alignment issues