Alignment issues fixed