Sorted out more alignement issues