Fixing align issues