How to handle alignment issues?