Fixing aligning issues